summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bumps Gitlab Omniauth LDAP versionbump-omniauth-ldap-gem-versionTiago Botelho2017-07-253-9/+13
|
* Merge branch '34361-lazy-load-images-on-the-frontend' into 'master'Jacob Schatz2017-07-2431-68/+287
|\ | | | | | | | | | | | | Resolve "Lazy load images on the Frontend" Closes #34361 See merge request !12503
| * Resolve "Lazy load images on the Frontend"Tim Zallmann2017-07-2431-68/+287
|/
* Merge branch '35444-error-500-viewing-notes-with-anonymous-user' into 'master'Robert Speicher2017-07-246-6/+37
|\ | | | | | | | | | | | | Resolve "Error 500 viewing notes with anonymous user" Closes #35444 See merge request !13037
| * Don't treat anonymous users as owners when group has pending invitesSean McGivern2017-07-246-6/+37
| | | | | | | | | | | | The `members` table can have entries where `user_id: nil`, because people can invite group members by email. We never want to include those as members, because it might cause confusion with the anonymous (logged out) user.
* | Merge branch 'rs-project-finder-spec-mysql' into 'master'Rémy Coutable2017-07-241-4/+4
|\ \ | |/ |/| | | | | | | | | Use `match_array` rather than `eq` in ProjectsFinder spec Closes #35489 See merge request !13052
| * Use `match_array` rather than `eq` in ProjectsFinder specrs-project-finder-spec-mysqlRobert Speicher2017-07-241-4/+4
| |
* | Merge branch 'pms-ux-debt-contribution-guide' into 'master'Sean McGivern2017-07-241-12/+14
|\ \ | | | | | | | | | | | | Add UX debt label to the contribution guidelines See merge request !13045
| * | Add UX debt label to the contribution guidelinespms-ux-debt-contribution-guidePedro Moreira da Silva2017-07-241-12/+14
| | | | | | | | | | | | gitlab-design#29
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceTim Zallmann2017-07-241-0/+49
|\ \ \
| * \ \ Merge branch 'enhance-backend-review-guide' into 'master'Rémy Coutable2017-07-241-0/+49
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Add GitLab-specific concerns to code review guide Closes #35099 See merge request !12999
| | * | Add GitLab-specific concerns to code review guideSean McGivern2017-07-241-0/+49
| | | |
* | | | How to Merge to external FileTim Zallmann2017-07-243-11/+16
|/ / /
* | | Merge branch 'dz-fix-calendar-today' into 'master'Phil Hughes2017-07-242-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix today day highlight in calendar Closes #32169 See merge request !13048
| * | | Fix today day highlight in calendarDmitriy Zaporozhets2017-07-242-1/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'fix/use-another-gitaly-feature-name-for-workhorse-send-blob' ↵Robert Speicher2017-07-242-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Use a unique feature name for Workhorse send blob migration See merge request !13031
| * | | | Use a unique feature name for Workhorse send blob migrationfix/use-another-gitaly-feature-name-for-workhorse-send-blobAhmad Sherif2017-07-242-3/+3
| | | | |
* | | | | Merge branch '35391-fix-star-i18n-in-js' into 'master'Filipa Lacerda2017-07-243-3/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix translations for Star/Unstar in JS file Closes #35391 See merge request !13013
| * | | | | Fix translations for Star/Unstar in JS file35391-fix-star-i18n-in-jsRémy Coutable2017-07-213-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'new-nav-duplicated-new-milestone-buttons' into 'master'Filipa Lacerda2017-07-243-3/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed duplicate new milestone buttons in new navigation Closes #35454 See merge request !13033
| * | | | | | Fixed duplicate new milestone buttons in new navigationnew-nav-duplicated-new-milestone-buttonsPhil Hughes2017-07-243-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #35454
* | | | | | | Merge branch '31533-usage-data-projects-stats' into 'master'Sean McGivern2017-07-243-6/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Slack and JIRA services counts to Usage Data Closes #31533 See merge request !12974
| * | | | | | | Add Slack and JIRA services counts to Usage Data31533-usage-data-projects-statsJarka Kadlecova2017-07-243-6/+42
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '33097-issue-tracker' into 'master'Sean McGivern2017-07-2438-130/+656
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Associate Issues tab only with internal issues tracker Closes #33097 See merge request !12130
| * | | | | | | Change docs to support paralel external and internal issue trackersJarka Kadlecova2017-07-243-5/+7
| | | | | | | |
| * | | | | | | Support both internal and external issue trackersJarka Kadlecova2017-07-2431-99/+563
| | | | | | | |
| * | | | | | | Associate Issues tab only with internal issues trackerJarka Kadlecova2017-07-246-31/+91
| |/ / / / / /
* | | | | | | Merge branch 'pawel/bump_prometheus_client_library' into 'master'Sean McGivern2017-07-242-1/+5
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Fix bug causing truncation of Metrics files See merge request !13035
| * | | | | | [ci skip] Add Changelog entry metrics files handlingPawel Chojnacki2017-07-241-0/+4
| | | | | | |
| * | | | | | Fix bug with truncation of file containing metricsPawel Chojnacki2017-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | bump prometheus gem version
* | | | | | | Merge branch 'upgrade-re2' into 'master'Grzegorz Bizon2017-07-245-34/+24
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Upgrade the re2 gem to 1.1.0 See merge request !13036
| * | | | | | Upgrade the re2 gem to 1.1.0Nick Thomas2017-07-245-34/+24
| |/ / / / /
* | | | | | Merge branch 'bvl-fix-invalid-po-files' into 'master'Rémy Coutable2017-07-246-19/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix currently invalid po files Closes #35302 and #35235 See merge request !13032
| * | | | | | Fix currently invalid po filesbvl-fix-invalid-po-filesBob Van Landuyt2017-07-246-19/+17
| | |/ / / / | |/| | | |
* | | | | | Merge branch '28202_decrease_abc_threshold_step2' into 'master'Rémy Coutable2017-07-245-13/+177
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decrease ABC threshold to 56.96 See merge request !11227
| * | | | | | Decrease ABC threshold to 56.96Maxim Rydkin2017-07-245-13/+177
|/ / / / / /
* | | | | | Merge branch ↵Rémy Coutable2017-07-241-3/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34996_add_portuguese_brazil_translations_of_pipeline_schedules' into 'master' Add Portuguese Brazil translations of Pipeline Schedules Closes #34996 See merge request !12823
| * | | | | | Add Portuguese Brazil translations of Pipeline SchedulesHuang Tao2017-07-241-3/+24
|/ / / / / /
* | | | | | Merge branch 'fix/gb/project-update-with-registry-images' into 'master'Rémy Coutable2017-07-243-2/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix editing project with container images present Closes #35443 See merge request !13028
| * | | | | | Fix editing project with container images presentGrzegorz Bizon2017-07-243-2/+20
|/ / / / / /
* | | | | | Merge branch 'rs-overcreating-users' into 'master'Rémy Coutable2017-07-242-12/+24
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Create guest users only when necessary rather than for every spec See merge request !13024
| * | | | | Create guest users only when necessary rather than for every specrs-overcreating-usersRobert Speicher2017-07-212-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are two examples of a top-level `before` block doing too much. Only specific specs cared about these guest users, but we were creating them and their `ProjectMember` records for every single spec that ran.
* | | | | | Merge branch 'compress-nav-logo' into 'master'Phil Hughes2017-07-241-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Compress gitlab SVG logo See merge request !13026
| * | | | | Compress gitlab svg logocompress-nav-logoClement Ho2017-07-211-1/+1
| | | | | |
* | | | | | Merge branch '34316-edit-issues-sidebar-needs-some-ui-polish' into 'master'Phil Hughes2017-07-245-11/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bulk update sidebar UI polish Closes #34316 See merge request !12622
| * | | | | | Bulk update sidebar UI polishBryce Johnson2017-07-245-11/+28
|/ / / / / /
* | | | | | Merge branch '35399-mini-graph-commits-box' into 'master'Phil Hughes2017-07-242-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix margin in mini graph for commits box Closes #35399 and #35383 See merge request !13014
| * | | | | | Fix margin in mini graph for commits boxFilipa Lacerda2017-07-242-1/+9
|/ / / / / /
* | | | | | Merge branch '35412-language-space' into 'master'Phil Hughes2017-07-241-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add space between words in language dropdown Closes #35412 See merge request !13016
| * | | | | | Add space between words in language dropdownFilipa Lacerda2017-07-241-3/+3
|/ / / / / /
View Lorry Controller Status