- 02 Dec, 2016 10 commits
-
-
Alejandro Rodríguez authored
[ci skip]
-
Alejandro Rodríguez authored
-
Rémy Coutable authored
Fixes ActionView::Template::Error: undefined method `text?` for nil:NilClass Closes #25251 See merge request !7893
-
Sean McGivern authored
Fix URL rewritting in the Help section Closes #25199 See merge request !7875
-
Sean McGivern authored
Fix GitHub importer to import PR where source repo/fork was renamed/deleted Closes #24594 See merge request !7865
-
Yorick Peterse authored
Resolve "Merge request dashboard page takes over a minute to load" See merge request !7760
-
Douwe Maan authored
Pass commit data to ProcessCommitWorker This changes `ProcessCommitWorker` so that it takes a Hash containing commit data instead of a commit SHA. This means the worker doesn't have to access Git just to process a commit message (and other data it may use). This in turn should solve the problem of ending up with 15 000-something jobs in the `process_commit` queue that take forever to process. See merge request !7744
-
Alfredo Sumaran authored
Allow dots in group names to pass validation for Create Group and Edit Group forms ## What does this MR do? Allows dots within group names to pass form validation when creating or editing a group. ## Are there points in the code the reviewer needs to double check? Nope, pretty straight forward. ## Why was this MR needed? Although group names with dots are allowed, our frontend validation mistakenly invalidates them ## Screenshots (if relevant) #### Before: ![Screen_Shot_2016-11-23_at_4.55.03_PM](/uploads/006ee5f694de1c98e0df0b0ccd3807ee/Screen_Shot_2016-11-23_at_4.55.03_PM.png) #### After: ![Screen_Shot_2016-11-23_at_4.52.42_PM](/uploads/693f112fb309005b0df714b32c99f25e/Screen_Shot_2016-11-23_at_4.52.42_PM.png) ![Screen_Shot_2016-11-23_at_4.51.53_PM](/uploads/7bdb5fca92995d18a7f38d9150eb260c/Screen_Shot_2016-11-23_at_4.51.53_PM.png) ## Does this MR meet the acceptance criteria? - [ ] ~~[Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added~~ - [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [ ] ~~API support added~~ - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Related to: #24622 Closes #24903 See merge request !7723
-
Fatih Acet authored
Revert signin tab order fix. The history: > 1. @sytses created this: https://gitlab.com/gitlab-org/gitlab-ce/issues/23279 > 2. The fix was submitted here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6867 > 3. I [made](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6867#note_16993324) the same observation you did after it was merged 4. A long discussion about accessibility and UX followed, and we decided to revert all changes (https://gitlab.com/gitlab-org/gitlab-ce/issues/23698). ## Screenshots (if relevant) ![2016-11-17_20.55.22](/uploads/c81b0bbe0cd08747124531778af6273f/2016-11-17_20.55.22.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23698 See merge request !7538
-
Douwe Maan authored
Ensure state param has a valid value when filtering issuables. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25064 This fix makes sure we only call safe methods on issuable when filtering by state. See merge request !2038
-
- 01 Dec, 2016 26 commits
-
-
Alejandro Rodríguez authored
-
Alejandro Rodríguez authored
[ci skip]
-
Stan Hu authored
Make deleting with optimistic locking respect NULL Make deleting with optimistic locking respect NULL For now deleting with optimistic locking is broken when lock_version is still NULL, because Rails would try to delete with `lock_version = 0` while in the database the column is still `NULL`. The monkey patches would force Rails just pass whatever in the column, and stop Rails from casting `NULL` into `0` when the value is read from database. Closes #24766 See merge request !7867
-
Stan Hu authored
Gracefully recover from Redis connection failures in Sidekiq initializer Precompiling assets and other Rake tasks would fail if Redis were not available in certain cases. * Closes gitlab-org/gitlab-ce#25143 * Closes gitlab-org/omnibus-gitlab#1743 See merge request !7835
-
Fatih Acet authored
Pick valid event objects for the events list ## What does this MR do? Fixes JS error when loading events with possible `null` objects ## What are the relevant issue numbers? Closes #24836 See merge request !7689
-
Fatih Acet authored
Fixed resolved discussion timeago not rendering ## What does this MR do? Initialises the timeago element when a discussion is updated or resolved. ## Screenshots (if relevant) ![Screen_Shot_2016-11-22_at_11.49.22](/uploads/02900cc4de019ac33cd4d59d586629aa/Screen_Shot_2016-11-22_at_11.49.22.png) ## What are the relevant issue numbers? Closes #24787 See merge request !7656
-
Fatih Acet authored
resolves updated and resolved status is not showing ## What does this MR do? This MR fixes #24780 ## Are there points in the code the reviewer needs to double check? NR ## Why was this MR needed? This MRs removes some important information as par suggested design in #19797. it restores that information ## Screenshots (if relevant) **Before:** ![before](/uploads/a93091e783de3e550a07ddbc1fa8085a/before.png) **After:** ![after](/uploads/ceb7f64a6f20155abcf6ea49d4b8059e/after.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24780 See merge request !7655
-
Kamil Trzciński authored
Evalute time_ago method instead of printing it ![Screen_Shot_2016-11-21_at_21.00.34](/uploads/295ffa522865fe1865b0c0b552a49ebf/Screen_Shot_2016-11-21_at_21.00.34.png) See merge request !7634
-
Rémy Coutable authored
Fix a broken link and avoid potential creation of future broken links on the help page. See merge request !7582
-
Douwe Maan authored
Remove caching of events data This MR removes the caching of events data as this was deemed unnecessary while increasing load on the database. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6578#note_18864037 and 5371da34 for more information. See merge request !6578
-
Stan Hu authored
Revert bump in rufus-scheduler Somehow `bundle install` with an update to Sidekiq-cron in !7815 caused rufus-scheduler to be bumped, when it doesn't appear absolutely necessary. Closes #25160 See merge request !7844
-
Sean McGivern authored
Fixes access to the wiki code with git when repository feature disabled ## What does this MR do? Allow access to the wiki repository with git when the repository feature is disabled. ## Why was this MR needed? Without this fix, if you create a wiki only project you are not allowed to download the wiki code from this project. ## Does this MR meet the acceptance criteria? - [X] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [ ] ~~API support added~~ - Tests - [X] Added for this feature/bug - [ ] All builds are passing - [X] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Fixes #24931 See merge request !7832
-
Sean McGivern authored
Fix a transient spec failure Closes #24772 See merge request !7825
-
Robert Speicher authored
Update Sidekiq-cron to fix compatibility issues with Sidekiq 4.2.1 The "Enqueue Now" button would not work in the admin panel due to changes in the Web extension interface: https://github.com/ondrejbartas/sidekiq-cron/commit/88ada926132d4658e3fd370c9f44899b6c88ccaf Closes #24376 See merge request !7815
-
Annabel Dunstone Gray authored
Fix pipelines info being hidden in merge request widget ## What does this MR do? Reintroduces CSS classes that are necessary for `MergeRequestWidget` to show correct divs. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~[ ] API support added~~ - Tests - ~~[ ] Added for this feature/bug~~ - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25055 See merge request !7808
-
Rémy Coutable authored
Update GitLab Workhorse to v1.0.1 v1.0.0 was wrongly tagged, causing compiled gitlab-workhorse binaries to misreport their version number. Closes https://gitlab.com/gitlab-org/gitlab-workhorse/issues/77 See merge request !7759
-
Sean McGivern authored
Clean up JiraService Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24967 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24777 See merge request !7756
-
Douwe Maan authored
fix for builds with no start date throwing an error in cycle analytics events Instead of the error, we should inform that there is no start date - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24925 See merge request !7738
-
Fatih Acet authored
Fixed issue boards issue sorting when dragging issue into list ## What does this MR do? Currently it just appends the new issue to the end of list & then sorts by priority which can cause some strange effects. For example if you drag the issue to the top of the list & then vue re-renders, the issue actually goes to the bottom. This changes that by adding the issue at the specific index. ## Screenshots (if relevant) ![boards-sorting](/uploads/9aa4a0cb5e0be79e7d24ab2b6abb0bbb/boards-sorting.gif) See merge request !7734
-
Douwe Maan authored
Refresh project authorizations using a Redis lease This MR changes `User#refresh_authorized_projects` so it uses a Redis lease instead of relying on serializable transactions. See the commit message(s) for more details. See merge request !7733
-
Annabel Dunstone Gray authored
new system note design for commit discussion ## What does this MR do? This MR implement new system notes design for discussion on a commit. ## Are there points in the code the reviewer needs to double check? NR ## Why was this MR needed? It improves UX and coherent style in UI ## Screenshots (if relevant) **before** ![commit-discussion-before](/uploads/b68ab7cce583a18ac066691448f955e7/commit-discussion-before.png) **After** ![commit-discussion-after](/uploads/e9c0cb48c29fdd9b6de6f23a3c588d03/commit-discussion-after.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24894 See merge request !7721
-
Yorick Peterse authored
Fix: Timeout creating and viewing merge request for binary file See merge request !7713
-
Sean McGivern authored
Prevent error when submitting a merge request and pipeline is not defined Closes #24860 See merge request !7707
-
Fatih Acet authored
Fixed commit time not rendering after initial page load ## What does this MR do? Inits the timeago for commits when infinite scrolling which fixes the issue of the timeago not rendering correctly when scrolling down. ## What are the relevant issue numbers? Closes #24862 See merge request !7704
-
Sean McGivern authored
Create tag after running pre-hooks and pass updated SHA to post-hooks Closes #24813 See merge request !7700
-
Robert Speicher authored
Rephrase some system notes to be compatible with new system note style See merge request !7692
-
- 28 Nov, 2016 2 commits
-
-
Alejandro Rodríguez authored
-
Alejandro Rodríguez authored
[ci skip]
-
- 25 Nov, 2016 1 commit
-
-
Robert Speicher authored
Update grape-entity to 0.6.0 See merge request !7491
-
- 24 Nov, 2016 1 commit
-
-
Alejandro Rodríguez authored
-