summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Ensure we are looking for the right dropdown inside the form wrapperbranch-permissionsAlfredo Sumaran2016-08-051-2/+2
|
* Set for for labels and ID for dropdowns on create formAlfredo Sumaran2016-08-052-5/+6
|
* Fix .panel-title styleAlfredo Sumaran2016-08-053-2/+9
| | | | | | Since .panel-heading is a bit different from bootstrap, using .panel-title for h3 looks different. So with this .panel-title will look good again inheriting custom properties our app sets for .panel-heading
* Refine selector for form submit buttonAlfredo Sumaran2016-08-051-1/+1
|
* Fix spelling. `braches` to `branches`Alfredo Sumaran2016-08-051-1/+1
|
* Cache onSelect callback before passing to each dropdown instanceAlfredo Sumaran2016-08-051-7/+9
|
* Wrap param with parens for consistencyAlfredo Sumaran2016-08-051-1/+1
|
* Prevent setting HTML directly from the JSAlfredo Sumaran2016-08-052-3/+4
|
* camelCase param nameAlfredo Sumaran2016-08-051-4/+4
|
* Wrap classes with IIFE and define it inside gl namespaceAlfredo Sumaran2016-08-055-121/+141
|
* Add url to Wildcard protected branches documentationAlfredo Sumaran2016-08-051-1/+2
|
* Create protected branch dropdown directlyAlfredo Sumaran2016-08-052-16/+5
| | | | Since there’s only one dropdown of this type we don’t need a class to create this dropdown masively.
* Move classes into its own fileAlfredo Sumaran2016-08-052-13/+12
|
* No need to pass event as a parameterAlfredo Sumaran2016-08-053-8/+6
| | | | We should stop passing events as a parameter since we cannot call the method programatically without faking or creating an event even when that event is not entirely required.
* Add custom css class to each dropdown to fix failing specAlfredo Sumaran2016-08-052-5/+5
|
* Select first value by defaultAlfredo Sumaran2016-08-051-2/+11
|
* Remove unnecesary classes to generate dropdownsAlfredo Sumaran2016-08-053-30/+6
| | | | Since there are only one dropdown of each type there are no need to create a class to initialize multiple elements with the same CSS class name.
* Fix class names and move each class to its own fileAlfredo Sumaran2016-08-0510-74/+79
|
* Refactor of Protected Branch Edit ListAlfredo Sumaran2016-08-054-10/+79
|
* Update layout and JS for create protected branch.Alfredo Sumaran2016-08-0514-215/+259
| | | | Also updates protect branch list
* Merge branch 'date-time-to-day-tests' into 'master' Jacob Schatz2016-08-051-0/+31
|\ | | | | | | | | | | | | | | | | Added tests to dateTime utility getDayName method ## What does this MR do? It was missing tests so i've created some tests to check the correct day name is returned See merge request !5324
| * Added tests to dateTime utility getDayName methoddate-time-to-day-testsPhil Hughes2016-07-181-0/+31
| |
* | Merge branch 'issuable-dropdowns-changelog' into 'master' Jacob Schatz2016-08-051-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Added changelog item for issuable form dropdowns ## What does this MR do? Adds CHANGELOG item about the new dropdowns in the issuable form See merge request !5266
| * | Added changelog item for issuable form dropdownsPhil Hughes2016-08-051-0/+3
|/ /
* | Merge branch 'ref-switcher-enter-submit' into 'master' Jacob Schatz2016-08-053-20/+61
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed enter submitting form in dropdown ## What does this MR do? When searching for a branch in the ref switcher & then pressing enter it would submit the form without anything. This instead doesn't submit the form without anything being selected in the dropdown. Also improved the UX by making it submit with `Turoblinks` as currently no loading bar is shown so the user has no idea if anything is happening. ## What are the relevant issue numbers? Closes #19549 See merge request !5111
| * | Underscore variable to camelCaseref-switcher-enter-submitPhil Hughes2016-08-041-3/+2
| | |
| * | Fixed issue with `this` not being definedPhil Hughes2016-08-031-2/+2
| | |
| * | Merge branch 'master' into ref-switcher-enter-submitPhil Hughes2016-08-03972-26297/+39264
| |\ \
| * | | Added ref switcher enter key testsPhil Hughes2016-07-191-0/+29
| | | |
| * | | Fixed issue with filtering & pressing enter keyPhil Hughes2016-07-191-4/+2
| | | |
| * | | Prevent default on link click in ref switcherPhil Hughes2016-07-191-1/+2
| | | |
| * | | Improve conditionalAlfredo Sumaran2016-07-181-1/+1
| | | |
| * | | Fixed navigational keys not working when filteringPhil Hughes2016-07-181-1/+1
| | | |
| * | | Fixed enter submitting form in dropdownPhil Hughes2016-07-182-28/+34
| | | | | | | | | | | | | | | | Closes #19549
* | | | Merge branch '19752-pipelines-finished-at' into 'master' Jacob Schatz2016-08-056-8/+64
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update timeago to shorter representation ## What does this MR do? Shortens representation of `Finished at` block in pipelines & builds ## What are the relevant issue numbers? Closes #19752 Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/18920 ## Screenshots (if relevant) ![Screen_Shot_2016-07-14_at_8.54.44_AM](/uploads/85000549c49165d4481422eac5eb0ca9/Screen_Shot_2016-07-14_at_8.54.44_AM.png) See merge request !5225
| * | | | Update timeago to shorter representation19752-pipelines-finished-atAnnabel Dunstone2016-08-046-8/+64
| | | | |
* | | | | Merge branch '14202-compare-lazy-load-commits' into 'master' Yorick Peterse2016-08-053-3/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bump gitlab_git to lazy load compare commits See merge request !5667
| * | | | | Bump gitlab_git to lazy load compare commits14202-compare-lazy-load-commitsPaco Guzman2016-08-053-3/+4
|/ / / / /
* | | | | Merge branch 'database-guides' into 'master' Achilleas Pipinellis2016-08-052-0/+154
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Guide about what requires downtime ## What does this MR do? This MR adds a guide describing various SQL operations and whether they need downtime or not. ## Are there points in the code the reviewer needs to double check? Spalling and styling of the text mostly. ## Why was this MR needed? Developers aren't always aware of the impact of certain operations and the documentation of MySQL and PostgreSQL can be quite confusing at times. ## Screenshots (if relevant) ![screenshot](/uploads/d8afd4bd3755d26e4786dfafecfa9368/screenshot.png) <img src="https://emoji.slack-edge.com/T02592416/trollface/8c0ac4ae98.png" width="60" /> ## Does this MR meet the acceptance criteria? - [x] ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~ - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [ ] All builds are passing - [ ] 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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5672
| * | | | | Added guide about migrations and downtimedatabase-guidesYorick Peterse2016-08-042-0/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This guide describes various commonly used operations and the impact they have on the availability of a GitLab instance.
* | | | | | Merge branch 'leading-slashes-relative-links' into 'master' Rémy Coutable2016-08-053-1/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore URLs starting with // in Markdown links ## What does this MR do? Render `[foo](//bar/baz)` as `<a href="//bar/baz">foo</a>`. ## Why was this MR needed? `[foo](//bar/baz)` currently renders as `<a href="//bar/gitlab-org/gitlab-ce/master/baz">foo</a>` ## What are the relevant issue numbers? fixes #7032 See merge request !5677
| * | | | | | Ignore URLs starting with // (!5677)winniehell2016-08-052-1/+3
| | | | | | |
| * | | | | | Add failing test for #7032winniehell2016-08-051-0/+5
| | | | | | |
* | | | | | | Merge branch 'add_description_to_plain_text' into 'master' Rémy Coutable2016-08-053-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add issue description to txt/plain emails ## What does this MR do? Adds issue description to new_issue mail when in text/plain content-type ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Because clients that are rendering emails in text mode can see issue description ## What are the relevant issue numbers? #1821 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5663
| * | | | | | | Add description to text/plain emailsdixpac2016-08-043-0/+5
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added to * new_issue_email * new_merge_request_email
* | | | | | | Merge branch 'side-by-side-unfold' into 'master' Douwe Maan2016-08-0515-89/+139
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add unfold links for Side-by-Side view ## What does this MR do? Add unfold links for Side-by-Side view and refactor some diff related code ## What are the relevant issue numbers? Closes #3877 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5415
| * | | | | | | Add unfold links for Side-by-Side viewTim Masliuchenko2016-08-0415-89/+139
| | | | | | | |
* | | | | | | | Merge branch 'upgrade-newrelic-rpm' into 'master' Robert Speicher2016-08-042-3/+3
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade newrelic_rpm from 3.14.1.311 to 3.16.0.318. ## What does this MR do? While we intend to remove newrelic in the future, it'll probably not happen until 9.0 due to. In the meantime, I'd like to update the gem so it won't block Rails 5. Changelog: https://github.com/newrelic/rpm/blob/master/CHANGELOG ## Why was this MR needed? Rails 5 compatibility. Relevant issues: #14286, #12860 See merge request !5553
| * | | | | | | Upgrade newrelic_rpm from 3.14.1.311 to 3.16.0.318.upgrade-newrelic-rpmConnor Shea2016-07-282-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug fixes and compatibility with Rails 5. Changelog: https://github.com/newrelic/rpm/blob/master/CHANGELOG
* | | | | | | | Merge branch '20621-avoid-lame-conflicts-in-ability-allowed' into 'master' Robert Speicher2016-08-041-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move abilities by subject class to a dedicated method ## What does this MR do? Twin of gitlab-org/gitlab-ee!622. It moves the `case` that returns abilities depending on the subject class to a dedicated method. This should avoid lame conflicts when CE to EE since the EE version assign the result of the `case` to a variable. ## What are the relevant issue numbers? Closes #20621. See merge request !5668
View Lorry Controller Status